Merge "Fix the feature flag mis-checking cause exception issue" into udc-dev am: e1faab7c

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



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