Merge "Always show lock icon if device is locked" into sc-dev am: c5aa20b9...

Merge "Always show lock icon if device is locked" into sc-dev am: c5aa20b9 am: 21e97adb am: ebae7391

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

Change-Id: Ia2638f4283cab2b674c747909f61acd12777333a