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