Merge "Fix the feature flag mis-checking cause exception issue" am: a78c7e67 am: aa09426e

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



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