[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: b24ba9d52f am: 2d45d999be am: 3daf8b8947 -s ours

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

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

Change-Id: I706f9304f2f336ae06a8cd4ecec4ac3015b5fa40