Merge "Move Lockdown to second place, after Emergency" into rvc-dev am: e38716c6a7 am: 6b2d93cf8a am: 29d443ad71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920904 Change-Id: I174605a417f14a1e069fc763138d06f94cf8f331
This commit is contained in: