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

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

Change-Id: I4c88f8516ed9ebe4510f7f8485514a49a098ffcd