Merge "Allow profile owner to disable iris/face on personal keyguard" into pi-dev am: 54a514eda0
am: 08a3535505

Change-Id: Ib60966a779b1bffdd288731ec2758b5bd20f028d