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

Change-Id: I9375842043dc95b0095f3df7c9ac8cae695a4d65