[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29
am: 133337b4dc
am: 7d86790c7b
am: 003ce809c6
skipped: 333afb4357
am: bd3672b2d8
am: 9f280a15a2
Change-Id: I2dae0b0e41b34480c99a81fd3c05014e5ec43f33
This commit is contained in: