Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 879d439e26  -s ours am: 9cfd7f3272
am: c5bff0f798  -s ours

Change-Id: If0f872166173581321949106d52f6a868e95ed75
tree: 3bf06197e8e0dddcd1f0240e00231ea2bc66be1c
  1. keystore/
  2. keystore-engine/
  3. Android.bp
  4. MODULE_LICENSE_APACHE2
  5. NOTICE
  6. OWNERS