Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad627 am: 1e9a56a83f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46be3b5cf0ccdd24545f671f09b5cc90aedca9e3