Merge "Revert "Remove coarse location pre-grant for preinstalled VrListenerServices."" into nyc-mr1-dev
am: 5633ad6921

Change-Id: Icac4e7e97d26e589cbad7815459945f7c15420bf