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