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