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