Merge "Merge "[LockScreen] Update bar state in NPVC." into tm-dev am:...

Merge "Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0 am: 04c8307b" into tm-d1-dev-plus-aosp am: 1ecb26b3 am: 17848a51

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



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