[automerger skipped] DO NOT MERGE - Skip RP1A.201005.006 am: 8f2c3b898c am: 4e04e485f3 am: 89210bc2f0 am: ad33333928 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0febaef917a9bd72a82a88ef455eff7a7cabe632