Merge "Non-priv apps are not allowed to use always/never lock task mode" into rvc-qpr-dev am: b668e7b376

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

Change-Id: I07f88d72551c4ac091b5bd8da6bc06596009d8d0