[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 23f26916b0 -s ours am: 9c4a8e5f3a -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdaa35a8f2c81b78d3b4a2933ab05ebe38a4c263