Merge "Introduce maxSdkVersion for <uses-permission>" into klp-dev