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

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



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