Merge changes I6eca0331,I346323cb am: c9af6cf307 am: 63dde898b5 am: 9b88d26db2

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

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