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

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

Change-Id: Ib2169fa737b0c6344b77860896a6f4fa5b98ef41