Merge "[Settings] Create a proxy for SubscriptionManager" am: b2380eaaee am: 73e6ec3231

Change-Id: Iafb4bf54ea21d88867b675bb71bf7eb1fec5bf06