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

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