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

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