[automerger skipped] Merge "Fix the feature flag mis-checking cause exception...

[automerger skipped] Merge "Fix the feature flag mis-checking cause exception issue" into udc-dev am: e1faab7c am: fa7150da -s ours

am skip reason: Merged-In Ibdacf947dcfc9e57015a03e38b836745b7353713 with SHA-1 0b1be85e is already in history

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



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