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

Change-Id: I33a8421c85d817a5947398c022cd1a2f161654de