Merge "Set primary services as enabled" into udc-dev am: 1dc52d15 am: 0e8839d1 am: 74375351 am: a5fff2a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998



Change-Id: Iaf2bec8fe46362e3a5e4c29048404bb0629f9fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>