Merge changes Iec22ff63,Iaca8a7cc am: 5a5613209d am: 26e29afb3e am: bdba76fe13

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I293366c6aac42f776ff23277a707d8c2ae0fd1b0