Merge changes Idd7d86f9,I73569744 am: 420476e0cd am: 086acc1ba8 am: 3fb101a052

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab663363b5f3156531bd8f8f0a876582bc843b7d