Merge "Hook up encryption to the enrollment flow." into qt-dev
am: 9f23712679

Change-Id: Idb216e322f5818856ac3a9414a8dd4287a679fbe