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

Change-Id: I0643ece792edffc282c22af7ff8ee5a8ef1c9fe2