Merge "Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am:...

Merge "Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79 am: 64174681 am: 7ac5f24a" into rvc-qpr-dev-plus-aosp am: c6c70549

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

Change-Id: Id2b8fe0315497a8201ad48797f06b762973d1c29