[automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 62cb684c8e am: 8f88af4e7a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib40f9a17ff6e75bd27c63d11ee66ef680c584b5e