Merge "Introduce minSdkVersion for <uses-permission>"