[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
am: bd3672b2d8

Change-Id: I9157d6fd4afc3426142dbfbbdc9a57aceb2b7d7f