Merge "Allow CTS tests to access more from KeyProtection" into pi-dev am: de9d071fc1
am: a0f8cda39c

Change-Id: I276216d378e8edd01bbf4a8c516027960894b85e