Merge changes Ifabf5e2b,I2e632532 am: c0e2e1c9bd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I530ba4da323b220ea2fe4ccd4fe2f57c95143dcd