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: I0bdbd3844514a3c4330addfd4fd1f36903bf0952