Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master am: 5928b5bced

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

Change-Id: I982e5faac90a9e7a5123b34ae57c72b7bda2bf1f