Merge changes I8fffd952,Ief6690bb am: b4203793bf am: d16fff5b00 am: 476343a40c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fee6969997c057f6ed972ea4dcfaa7500f8a213