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

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

Change-Id: Ie01fc814f5f6282e19ab178eec32f3e959b73588