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