Merge "min_sdk_version should be (level) and not (kind+level)." into...

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

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



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