Merge QP1A.180823.001

Change-Id: I68ae4b1e5e8df2e9edd80e4abdba6a75efb29845
tree: 33b0e3973cbbc5f17875e9908a2ea201a23e2270
  1. java/
  2. tests/
  3. Android.bp
  4. build.gradle