[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings." into pi-dev
am: 0f8423ff59 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie46a3606a283c89a9a6d5fceb25af286c6433b73