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: f6507452

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



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