Merge changes I3af271d0,I46df1c8b,I1eb116e4,I492bfc97 am: fb15a05e90

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

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