Merge "Inline notif pipeline flag into NSSLController" into tm-qpr-dev am: bd911d18

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



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