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: 657e9583 am: 3cb72a00

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



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