Merge changes Ic84936e0,Ia3845819 am: af9b52bdf8

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

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