Merge "Merge "Update SubInfo docs for ICC ID / num restrictions in API 30"...

Merge "Merge "Update SubInfo docs for ICC ID / num restrictions in API 30" into rvc-dev am: e219b919 am: 1f121ac7" into rvc-d1-dev-plus-aosp am: 3806f307

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

Change-Id: I791eaac25933e516f48c8fe3a27683742ab7e9b0