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

Change-Id: Ife154aab45f1b3f2864898a872c5a5a0191f0a9f