Merge "Inline notif pipeline flag into NSSLController" into tm-qpr-dev am: bd911d18a3 am: 26f0f87bbf

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

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