Merge "min_sdk_version should be (level) and not (kind+level)." into tm-qpr-dev am: 44a6d7fb

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



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