Merge changes If8097d58,Ic8ec4587,If37b26fa am: fbd9f328ab am: 44e3093a8b am: 7fac084c9c

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

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