Merge changes Ifd00d8d4,Id8db2858 am: eb3651fe72 am: a2ba909c39

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

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