Merge changes I3f51e6ca,I8057ebb7,I63cfd666,I0580b9b6 am: 36dc7b98 am:...

Merge changes I3f51e6ca,I8057ebb7,I63cfd666,I0580b9b6 am: 36dc7b98 am: 9fffabf7 am: 5a0ec14b am: 1d27271b am: 0dd301f8

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



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