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