[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810
am: d1278a3d3d
am: 8722e00b4a
-s ours am: ce8ecb5ca9
-s ours
am skip reason: skip tag Change-Id I9d2abe1abe3082267ed64b71602d8ada21c95c6c with SHA-1 1dcc788177
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427
Change-Id: I1dfb2713bc963b7c7b33f4154da4d934ac7b956d
This commit is contained in: