Merge \"Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be am: 268a22feb6\" into nyc-mr1-dev-plus-aosp
am: 698d5c573c

Change-Id: I30c69ffe3b190b96284aecdedb5013fdcf172396