Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json" am: 58982618e1 am: f7f933b28b
am: 8543ca7fd5

Change-Id: Idc0fa1742e53cb399829ce5fbca2f396388e4095
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index c174d2f..3b3a8dd 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -992,6 +992,10 @@
     codename = codename.strip()
     if codename:
       result[codename] = api_level
+
+  # Work around APKs that still target 'Q' instead of API 29 (b/132882632).
+  result['Q'] = 29
+
   return result