Merge "Support 'uses-permission.*' case" am: 3f7d731fbd
am: 52e32a5337

Change-Id: Id5c52bb8e2b25377f4fc8b1ee2075012ff5c13cf