[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am:...

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 2d26f82a -s ours am: fa74a4dc -s ours am: 6a3b023f -s ours am: d7d4fe0c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I51c8fa8496c973622b6388060fffedcdc6ad1407