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

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

Change-Id: I2173f075ebc7b171624e3519f574c0bdac7b44a1