Merge changes I45054e68,I6f301314 am: 2befe56df0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a083699efe686d26c6f3bc1f163f94504f1595f