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

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

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

Change-Id: Ic3c308b1cd465ee64ed4c1a34599ecd4d6ed22c5