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

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



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