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

Diff Content Not Available