Merge "Updates internal lock task mode state early" into rvc-dev am:...

Merge "Updates internal lock task mode state early" into rvc-dev am: 836d2b0f am: 433364c4 am: bdeb63f8

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

Change-Id: I07e8a346b7e860926a506e635a181788a7f1e7eb