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

Change-Id: Id22045cb97e0c8b151798304eb0402d1c87b5039