[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: d6c9aeda -s ours am: d912dd86 -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: Ib03644b405963f3ba61864d1451f13ac3108bd3d