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

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

Change-Id: I57362a5eb9246728658bc161cc381d11f3549428