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: I4dd7fcb722810ecc8a844b5353f3b202b7e9f72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>