Merge "Correctly parse minSdk even when targetSdk is a codename" into tm-dev...

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

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



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