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

Change-Id: I07759331dcb1c86a11acfea44ae8d0b34f08a2a8