Merge changes I1ceccedd,Ide2c7302 am: c70a7d6258 am: 788f94aff2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I396a6f333f7449a6fa680fac9b3c31d6dd8f5bec