Merge changes Ic84936e0,Ia3845819 am: af9b52bdf8 am: 65f4f4f698

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

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