Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: Id7b68cfc15856ae3370bb9391b46a67c7c1f5505
BUG: 129345239
tree: 48dbb10f5bcf70273982c07fd8b5d12d97a1dd0c
  1. java/
  2. tests/
  3. Android.bp