[automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am:...

[automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 66e3e10c am: 0cea9ab8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ief5fda464279348a7a2b430703b85524f8bcb4ef