Merge "Correctly parse minSdk even when targetSdk is a codename" into tm-dev am: 2fb8b2d8

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



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