DO NOT MERGE am: 8d55249939

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2843795

Change-Id: I81d56fbd0c371cf99a3a9e8f3c93f28205a37794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>