Merge "Always show lockdown button" into sc-dev am: 04697f8263 am: b8abde227f am: ebf00fdc7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15289457 Change-Id: I03fdb70e7c13cab5f4aedb0e2dba13cb3ded91df
This commit is contained in: