Merge "Remove exclusivity restriction of multiple preferences" am: 278b92f6a0

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

Change-Id: Ib41c5050c389ac115221005f565ff4f59a799502