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:
committed by
Android (Google) Code Review
commit
1fd7dfb12e