Merge QP1A.190613.002

Change-Id: I30475de9324133f185c0e656e40a44effc7796c0
tree: 8c3210ebf8282105da3271fe94b5bd9ab6f50c6d
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS