Merge changes I0f1d59ae,I2f63bffb am: 9f7a73fc21

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I937c39caa5f28148279f2cc7c85c07b90eb3fac4