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