Merge "Remove exclusivity restriction of multiple preferences" into sc-dev am: fd301c05c5 am: f534ef200d am: 33e0aa7489

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

Change-Id: I690ac6218ef453a8d6d0dd99786aaa8737551305