Merge "Set primary services as enabled" into udc-dev am: 1dc52d15 am: b4929148 am: 14efad99 am: 9b6a7daf

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



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