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