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

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

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