am c40ed4d7: am 8dae225b: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev

* commit 'c40ed4d76a7ce8b36e14ef00b25e2189f90c35f5':
  Rename reg/unreg OnSubscriptionsChangedListener.