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

Change-Id: Ib66ad2735d01dc3f918ffbd133fcbe5d006bb85f