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