Merge changes I0e6df469,I3d46d5f7 am: b9c396b87a am: a3bb15cb68

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I307dce7840699d1145be3a57c1f03623bd521c04