Merge "Rename trustedUserPresenceRequired." into pi-dev
am: 840c29eb0b

Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6