[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change...

[automerger skipped] Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 564f7029 am: 42b18ce6 am: ab937ca7 -s ours am: 552737f5 -s ours

am skip reason: skip tag Change-Id I129147b88a613271d2e0e58ac5ab38ac2f38f25d with SHA-1 0dd99c5e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1646911

Change-Id: Ibcf92e50a7a76ab7f30c273f4f29dd8803a791db