Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 4334b51165 am: 3b04be0299 am: 8220b04f22 am: e36a53f891
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287 Change-Id: I2fa5e9d370992a83ff9f3c62999c0bdd74197247
This commit is contained in: