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

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

Change-Id: I99af87f0106609da19f93306a8c06b79d4634fed