Merge "Update VrListener location permission." into nyc-dev am: 403970c3ce
am: 755b72be0f

* commit '755b72be0fd0a14dacf849411ed0187c6ad8a75e':

Change-Id: I81b1b1be3d7dce19f3ff0d06a90f660857f90428