Merge "Set primary services as enabled" into udc-dev am: 1dc52d15

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



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