[automerger skipped] Merge "DO NOT MERGE - Skip RP1A.201005.006" am: 359ae7a2 am: 6083f75d am: bc2486e1 am: 9c8fd443 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1dc2b80fc675683cacc4f58f0bc93f3bfa9e3d49