Merge "Reduce unnecessary NotificationListener binder transaction." am: d3ec7950e3
am: c3918379eb

Change-Id: I3270a2dcc3a41a46c74bfbb4e636da1264b6c5cd