[automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: 8e9e1764 -s ours am: f8ba311c -s ours

am skip reason: Change-Id If00554d9b0cd56b3c7d91acbab96708de34a18f4 with SHA-1 4e407a94 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd03849bf4b6d2178abdf01ed2becd1ae2fa7aaf