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