Merge changes I3f51e6ca,I8057ebb7,I63cfd666,I0580b9b6 am: 36dc7b98be am: 9fffabf782

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

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