Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am: d054f4f2fe

Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb