Merge changes Ic5750d4f,I9fa888c9,I4211475f am: b330b5b71a am: 301f376e82

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife4211d4f6892a0751ef71f284fd4a5f06148a82