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

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

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