Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 am: aa6698b0b4 am: 16aa1bcc9f

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

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