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

Change-Id: I973172fc17b8cdcfa578923f3cec750456e604dc