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

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

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