Merge changes I9eed58b2,Ie83c5ee3 am: 047585ed00

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

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