[automerger skipped] Merge "DO NOT MERGE: Fix array casting bug" into rvc-dev...

[automerger skipped] Merge "DO NOT MERGE: Fix array casting bug" into rvc-dev am: e632c246 am: 4064cfb4 am: 026d43a3 am: c00a8d89 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11971856

Change-Id: Ibc93985344b5d8edb500aad909e1fda41ec4fc02