Merge "Support BetterTogether feature flags in services code." into udc-dev am: 0683f76e am: 7500c6bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610896



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