[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc

Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1