Merge "Add fields for PhoneAccountHandle without IccIds in T" into tm-dev am: fa0b6921

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



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