Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf am: 2425886baa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I309434985d7dc6c1cbcb411f6f08ebc4dc5d37d4