Merge changes Ifd00d8d4,Id8db2858 am: eb3651fe72 am: a2ba909c39 am: 71db43c5e2

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

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