Merge changes I8fffd952,Ief6690bb am: b4203793bf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a3d4db0692b9266992386916bbae57b360e703f