Merge "fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission"
am: d5d30c2f16

Change-Id: I32edc7a87d1c0b49a44806c89407a2f644b94110