[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: bc51e39b78 -s ours
am: 0f721dedb9

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