Merge "Remove the PRODUCT-* goal" am: a2d19cfd05 am: f02f1f16f0
am: 415fcd6e0c

Change-Id: I5d0f2e4b7660a5906c770b488619cbbf0a22ef18
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 3119afa..080f289 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -1004,6 +1004,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