Merge changes I1476a938,I111189d1 am: b4eec7fc1f

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

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