Merge changes Ieae66cc7,Idf94ddb5 am: 7d486bd054

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c380bab3d814c44d4df5b0267fe45ee1f2d6f0f