This reverts commit b8e9782f70.
Bug: 77257848
Test: Can change from pattern to pin/password
Change-Id: I17f9625e506c8e0839fffa95a62c904890cac603
This reverts commit b8e9782f70.
Bug: 77257848
Test: Can change from pattern to pin/password
Change-Id: I17f9625e506c8e0839fffa95a62c904890cac603