Merge changes I0731fa84,Id31a60ad am: 1ab1849ab2 am: 6e05084c6a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I081abc916ae5ec6333cfda1d8a6e5ee20560be85