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