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