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

Change-Id: I94567b327e905dbea9c185c9ec06e5c14e486a3a