[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

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



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