Merge changes Ieae66cc7,Idf94ddb5 am: 7d486bd054 am: 14659d0a88

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8a3291e3b5a8641ca9cd883c6c24b16ab2aa17a