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

Change-Id: I46108d61c62f8d3832837421db3a48122882fb5e