[automerger skipped] Merge "Non-priv apps are not allowed to use always/never...

[automerger skipped] Merge "Non-priv apps are not allowed to use always/never lock task mode" into rvc-qpr-dev am: b668e7b3 am: cbd20f44 -s ours

am skip reason: Change-Id Ic5f1b1531816a90ff341597e6d012a6c62c04480 with SHA-1 3d494aad is in history

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

Change-Id: I551fffe75d556d7844d0c266b99aac13d6a1f845