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

[conflict] Merge "Allow unknown codenames in target sdk version for APK-in-apexes" into tm-dev am: e748d40d am: 01076d8e

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



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