[automerger skipped] Merge "min_sdk_version should be (level) and not...

[automerger skipped] Merge "min_sdk_version should be (level) and not (kind+level)." am: 08f7735f am: 32c5b55d -s ours am: 82cb6e91 -s ours

am skip reason: Merged-In I6bf4e855032b41d0da44b672168eb3a681abefa0 with SHA-1 8f419fc8 is already in history

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



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