Merge "[flexiglass] Enables fingerprint unlock while in AOD" into main