Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am skip reason: subject contains skip directive" into qt-dev

This commit is contained in:
Android Build Merger (Role)
2019-05-08 20:20:20 +00:00
committed by Android (Google) Code Review

Diff Content Not Available