Merge "[Telephoy] Add phone Id to support DSDS" am: 40fa3f58b2 am: 36fb168817

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

Change-Id: Ia0c72bde710182dbd9e5e99c3ad5f309147a0353