Merge "Correctly parse minSdk even when targetSdk is a codename" into tm-dev am: 2fb8b2d8 am: 657e9583 am: 3cb72a00 am: 7179fd09

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



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