Merge "Move Lockdown to second place, after Emergency" into rvc-dev am:...

Merge "Move Lockdown to second place, after Emergency" into rvc-dev am: e38716c6 am: e2470870 am: 1a0da78f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920904

Change-Id: I2b44a1ab5ed3d8c645590f413a6a7f0a4d00f1d8