Update to "clean break" Keymaster::4.0

Keymaster 4.0 is being revised to remove references to 3.0, so we
don't have to deal with a mixture of types.  This CL updates
system/security/keystore for that change.

Test: runtest --path cts/tests/tests/keystore/src/android/keystore/cts/
Change-Id: Id522b037cb4c325b522e813ac678d7763b4ac204
3 files changed