[automerger skipped] [RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings. am: 5d6c1e8f45 -s ours
am: 6421f67d38

Change-Id: Icdc855ec185b74b2c6b966f0ccdcef3c1c526f3c