[automerger skipped] Merge "Merge Android R" am: cdb6b16d -s ours am:...

[automerger skipped] Merge "Merge Android R" am: cdb6b16d -s ours am: 73e86298 -s ours am: ff9fd7ef -s ours

am skip reason: Change-Id I1428ead11c6c2d6fd107a014df0082fdbfa9ba8a with SHA-1 c83049d9 is in history

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

Change-Id: Ie344d19e1523b967046adf84a1827bb1c8ddf687