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: f4e3ea20 am: 343cb742 am: 92b46807

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

Change-Id: I1eb7738ec2ef86ed2cdb6e7562fdf27a4c126792