Merge "Migrate Telephony PhoneAccountHandle ID from IccId to SubId in creation" into tm-dev am: ce204a9873 am: e1dab49cdb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17240597

Change-Id: I77fd0ce60afc0a375261cd08776b9f8fa7f85856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>