Merge "Expose getSmsCapacityOnIcc()" am: 4d96662b1f am: bb2a513010

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

Change-Id: I2b7d699b841d97a044d5f6c6276055d706238212