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

Change-Id: Id3e0dace3154489136a5dc36e19f240080a86dca