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

Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e