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

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

Change-Id: I65ee959f015208842645548c0d63ce8e68dde248