Don't pass the query parameter in if the calling package is null.

The provider would read the string "null" and always refuse restricted access.

Change-Id: I1a592c2284ada8ab3c41bc71e510bd4ec7fd05d8