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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad0d78dd0787d8eb1da38c208588414b7dfbbdac