[automerger skipped] Merge "Add...

[automerger skipped] Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" am: 286416d8 am: 04e5006c -s ours am: 21945f3e -s ours

am skip reason: Merged-In I25f1b05c505ec6631efa742c3da4bea5e6cdd28a with SHA-1 1e3717ef is already in history

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

Change-Id: Ie8e229bfd234a61514463f2eea64e4f89b606f30