Merge "Clear calling identity before pm.getServiceInfo to allow service validation" into main