Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5
am: 6417468179
am: 7ac5f24a1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287 Change-Id: Ibafb75e3b219b6105b75975925b5616487af0bc0
This commit is contained in: