Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 7d70dd9c33

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0742b4bb3c5b2ddaa06830b403d849ed25ef71cd