Snap for 6928731 from 6606785e542f9b9a27681526ff515b3d77bbe8ad to sc-d1-release

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