[automerger skipped] [RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings.
am: 5d6c1e8f45 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6fa7b4cd500cb43075a2543744c79d3b574e6bd