[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:
Jonathan Scott
2019-05-08 13:46:23 -07:00
committed by android-build-merger

Diff Content Not Available