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 am: 48bfa92d

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

Change-Id: I131826835fa5eef0438b1a62a80032d49de6c005