Merge changes from topic "am-6d3c333a1a1a4ced8a6f0af2d10145ec" into qt-dev-plus-aosp

* changes:
  Merge "Revert "RESTRICT AUTOMERGE Finalizing Q resources"" into qt-dev am: 6a0faa65
  Merge "Revert "RESTRICT AUTOMERGE Remove deprecated System APIs added in Q."" into qt-dev am: 8b3b7771
  Merge "Revert "RESTRICT AUTOMERGE Removing deprecated APIs added to Q"" into qt-dev am: 4acb8f46
  Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev am: 40a8e997