Merge "Keymaster: Move test to std::unique_ptr"
am: ce1ed06244

Change-Id: I351a99bfb33810876d2325c310325023965425fb