[automerger skipped] Merge "modemReducedFeatureSet add...

[automerger skipped] Merge "modemReducedFeatureSet add PhysicalChannelConfig_1_6 item" am: 9d38b91d am: f960f9b8 am: 9244dec4 -s ours am: 4e0817e5 -s ours

am skip reason: skip tag Change-Id I7d0c1b2534f50bbb445e2929b2807da0835d6bfe with SHA-1 0f2a75b4 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1682926

Change-Id: I8b739e12cf9e12d36321d51e514f2641f0e6ddcd