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

Change-Id: I8516f3ffa4c655195da3863d6ac23ab52af4ef70