Merge changes Ifa2aa335,I09366a7f am: 708c77d236 am: 7c2b530a09

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75892e729ba690205bea14512edef97d271611f0