Revert "Remove coarse location pre-grant for preinstalled VrListenerServices." am: cae8cdf91a
am: 1a509618d4

Change-Id: I3427f6c65b338a5fb94f57c817ba0feb2c0d47c2