Merge "Set primary services as enabled" into udc-dev am: 1dc52d15 am: b4929148 am: 9a9a6b13 am: 972423a2

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



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