Merge "Always show lock icon if device is locked" into sc-dev am: c5aa20b947 am: 3576db8989
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15164970 Change-Id: Icc8bf51b5f2946674b5aa67b9b84d2706cddb1e2
This commit is contained in: