[automerger skipped] Merge "[Telephony] Physical Channel Config should support DSDS" am: 435ba73a94 am: 80b01a7f47 am: c0015552d7 -s ours

am skip reason: skip tag Change-Id Ie6d884b17642958607de6cd44b28a1042ecfa713 with SHA-1 4e3ad4dbe4 is already in history

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

Change-Id: I74eb2187966ec4b92727d426391b1d110ceac361