Merge "Add flags to <uses-permission> manifest tags." into sc-dev