Merge QP1A.190219.001

Change-Id: Icc510b19fef5262ee58a10f6ad7a13362dea5bfb
tree: 197126e59370b34d539733f2df547c8f9d67878d
  1. java/
  2. tests/
  3. Android.bp