DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I8f64dab16a41541eddc6924489d37ba35ced2cff
tree: 0c0ecdf5b587c2a1c80cfed8d40c5aab3c0d7f46
  1. Android.bp
  2. src/