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