[automerger skipped] Merge "Merge stage branch to development trunk." am:...

[automerger skipped] Merge "Merge stage branch to development trunk." am: 70e1b90b -s ours am: 4a86e516 -s ours

am skip reason: Change-Id Ic44b98572611891b4e28c086035bab2d0f2565d7 with SHA-1 df76f611 is in history

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

Change-Id: I6988a973fbe4b1f2249c46d02c2b46947d8d239e