Settings: Lockscreen Shake Security && Timer (2/2)

Change-Id: I4d1be0254d5bc4befa85da36ac81cea8ca1857d1
Merge "Settings: Lockscreen Shake Security && Timer (2/2)" into pac-4.4