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: 3576db89 am: 72add0c9

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

Change-Id: I408d8aba63469b79008130845dd8f302f8cf6e11