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

* commit '31d95fd6f32779a3dc314b2b9259e9d5eb4ff333':

Change-Id: I1cc66ba60e96b2526bb655645b85d800b2243f47