[automerger skipped] Merge "Fix regression in UiccPkcs15#readBinary." into...

[automerger skipped] Merge "Fix regression in UiccPkcs15#readBinary." into sc-dev am: e808fed0 am: d7e47a83 -s ours

am skip reason: Merged-In I5dc77a2c380dcdc5cc1306c69e9c1996184c1d13 with SHA-1 929c7393 is already in history

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

Change-Id: I16a11aadd2b173eb0d7ec4dc5ab41f71d6b4f7ae