[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change...

[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: b24ba9d5 am: 2d45d999 am: 3daf8b89 -s ours am: 5e4093ed -s ours

am skip reason: skip tag Change-Id Ica29b8aee243168bb7719f01972075d54ff763e9 with SHA-1 c42f2697 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645304

Change-Id: I26d5ff02ff27b78b15cffe20f5fa75c76ba339b2