Improve KeymasterContext const correctness am: 821acb74d7
am: 4d2e6e1543

Change-Id: I2060c369fef3fa6c27b810b8bc8b240e0d36d697