am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev

* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.