[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 9e416782a2 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib9b40d4ce00a7ace37d70562dc5515aca945a30b
tree: 6161dfc9556138c6a506fcb1a6f8cd30ac754036
  1. androidx/
  2. com/
  3. net/
  4. org/
  5. .gitignore
  6. Android.bp