Merge "[Status Bar] Disable the keyguard status bar when we get the DISABLE_SYSTEM_INFO or DISABLE2_SYSTEM_ICONS flags." into tm-qpr-dev am: c2930187f9

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

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