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

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

Change-Id: I96b61694360c1861757f61f2a77447e81dacdecc