[automerger skipped] set NBM_FEATURE_FLAG to true. am: b9ae68b158 -s ours
am skip reason: Merged-In I88b4e5dfd16b1efbe87bf21459755ff2b4900d1f with SHA-1 1129bf752a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23854268
Change-Id: I03eb69f4c905164d9d60f8d666c8466db98748cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: