[automerger skipped] Merge "[Telephoy] Add phone Id to support DSDS" am:...

[automerger skipped] Merge "[Telephoy] Add phone Id to support DSDS" am: 40fa3f58 am: 36fb1688 am: bf415409 -s ours

am skip reason: skip tag Change-Id I6bf2285e37366ca517a3ea16194a203371e44964 with SHA-1 1835f13c is already in history

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

Change-Id: I5aec4568e35a02b0195837f9f88d1f4eda10b6c4