Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6 am: 089104cf50

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I695ba5ac549800fbf87a8c2a53e1eab86e91d2c3