[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86 is in history
Change-Id: I38f5b9533f851b98e1ea5c049d12959167b05361
This commit is contained in: