Merge "DO NOT MERGE - Skip RP1A.201005.006" am: 359ae7a2e0 am: 6083f75da7

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

Change-Id: I2ccd118b89f93d5361c59cb8738770685af44dd1