Merge "Rename feature flag to match mendel config." into udc-dev am: d636ddc6

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



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