Merge "Merge "Fix fingerprint-bound key test in work profile" into nougat-cts-dev am: 4a9240df07" into nougat-mr1-cts-dev
am: 95ec2b7644

Change-Id: I5619342bec70c55d1793e07c77aee9d932f791ae