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: Iadee99af6e91d0a56ce9b2b915f1d2fd85c1364d