[automerger skipped] Merge "set NBM_FEATURE_FLAG to true." into udc-d1-dev am:...

[automerger skipped] Merge "set NBM_FEATURE_FLAG to true." into udc-d1-dev am: dd7c827f -s ours am: 9908fe95 -s ours am: e4e3c77f -s ours

am skip reason: Merged-In I88b4e5dfd16b1efbe87bf21459755ff2b4900d1f with SHA-1 1129bf75 is already in history

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



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