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

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

Change-Id: Icf3445ab890d1d40eba48a4eb249818bd9ba8931