Merge changes I1ceccedd,Ide2c7302 am: c70a7d6258

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec9228c4ef5aabfed7901c3fb58efc663e20cc7c