Merge "Set notification listener defaults for system VrListeners." into nyc-dev am: aaabcce6d4
am: 9a344fe8f9

* commit '9a344fe8f927087f0dda7d3acfccae1c480829ef':

Change-Id: I0ba91674d40190e3bae9c726bb9632d4d29b940b