[automerger skipped] Merge "DO NOT MERGE - Merge RQ1A.201205.011" into...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master am: 5928b5bc am: e33396e4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I14897075a652c993c02e553b615075038c7edf97