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: ad752516

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

Change-Id: If60031668f5d995a0c8e744a2833c3f850c000dd