[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 854a8c6ee5 -s ours
am: 729d7b0452 -s ours
am skip reason: change_id I33a774efca2e5b3fe6d25f1edec36f0794e4be79 with SHA1 a90d607403 is in history

Change-Id: I13cb61fb3ae4a906b4bb2e92fe35d853a19bc4ea
tree: 0832b1592aa8200e0d8b30639bfea5813030a20d
  1. android/
  2. androidx/
  3. com/
  4. NOTICE.txt
  5. source.properties