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

[automerger skipped] Merge "Fix the feature flag mis-checking cause exception issue" am: a78c7e67 am: aa09426e am: bf1d8a9e -s ours am: 63a72cdb -s ours

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

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



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