Merge changes I8fffd952,Ief6690bb am: b4203793bf am: d16fff5b00

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8061fa36103f233e5f06d3a60e8f0e734fc0b0f