DO NOT MERGE - Skip RP1A.201005.006 am: 8f2c3b898c am: 4e04e485f3 am: 89210bc2f0

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

Change-Id: I923b3fbcb81a5890d8bbc22f460918b15af8258d