[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: 459720d22a -s ours

am skip reason: Change-Id I3c36d6f26c6a855a890329fc8c5229e5946b2d36 with SHA-1 b5c4befed9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If00554d9b0cd56b3c7d91acbab96708de34a18f4