[automerger skipped] Merge "Allow unknown codenames in target sdk version for...

[automerger skipped] Merge "Allow unknown codenames in target sdk version for APK-in-apexes" into tm-dev am: e748d40d am: 86e71dc8 am: 99e31bc6 -s ours

am skip reason: Merged-In If1195c8ec39ac88a605e25dfb1c78d49a5aa3e7c with SHA-1 99d04522 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17238066



Change-Id: Ia3a8f7cabe72c26e0e0d2fc78626ed327e18aab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>