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