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

Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc