Merge changes Ieae66cc7,Idf94ddb5 am: 7d486bd054 am: 14659d0a88 am: 42d3d9f4ae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf1db3d1c2f2c1be5858bb35c01b0b6f3fbececd