Snap for 6897674 from e28e03eb6f684bfb2d4d06a8675024f050cb2a6c to sc-d1-release

Change-Id: I9485f7ed7f42550fbc42e1f5e05f9e34d42d5c45
tree: af233de022dd72d5af4b23d97301399d8dad76bd
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS