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