Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Iab3cf8d2f65d676c9b254a8b4f47abc3bd28cfe4