Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2210099 Change-Id: I72b6c3ffdedf569f4d02d866574eca623ce91cb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>