[automerger skipped] Merge "Require READ_PHONE_STATE for getSmsCapacityOnIcc()...

[automerger skipped] Merge "Require READ_PHONE_STATE for getSmsCapacityOnIcc() instead" am: 9780be3d am: b6423d9d am: cbc3fb2e am: 7c7789d0 -s ours

am skip reason: Change-Id If403a4ba557e4322b25607c478b109e58a0e3ae9 with SHA-1 c201b490 is in history

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

Change-Id: Ibdcb75a0fb69c53a32aba216e11865387fdc10b3