Merge "Clarify PackageManager.checkPermission() and Context.checkPermission()." into main