[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings." into pi-dev am: 0f8423ff59 -s ours
am: 5c96be454f

Change-Id: I0010baef0cff1b2ada57269479015d15179f201f