[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours
am: 019e435e87
Change-Id: Id5fdd588bf25403d6fd58d2d6a5ab93004592a12
This commit is contained in: