Merge "Remove exclusivity restriction of multiple preferences" into sc-dev am: fd301c05c5 am: cebf317bef

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731887

Change-Id: I2dedac6259ce55e4c356a1a92fd34631af7f2586