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

Change-Id: I39fb214a71a3d84dedccf2ce42e9b19eeeb07542