Merge "Snap for 4455664 from ef5d1eebf70dc96da4d09f32608e3b99c881351a to oreo-vts-release" into oreo-vts-release
tree: cdd83eae0510a035684b0ff1ca283d1ef6f62151
  1. MODULE_LICENSE_APACHE2
  2. NOTICE
  3. keystore-engine/
  4. keystore/
  5. softkeymaster/