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