Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter" am: 6c64897b4e am: 3fef1ac0e8 am: 08293747be

Change-Id: I351568382899993f43ec39ab205e5978acfa5e93