Merge "Merge "Fix fingerprint-bound key test in work profile" into nougat-cts-dev am: 4a9240df07 am: dfc4353d8d am: 87884ecca3" into nyc-mr1-dev am: e19443ccf0
am: cc0fadfd99

Change-Id: I36248baf874064d6dc8cd5312bc014ff1532e7e3