Merge "Do not clear critical keys in clear_uid()" into oc-dev am: 48dc4ad3b9
am: 80f5705fb5

Change-Id: I42cc1360583a813d2a18d12c8453bbe5d0e88284
tree: cdd83eae0510a035684b0ff1ca283d1ef6f62151
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE