Merge "add setMetered in SubscriptionManager" am: 0dbd3d7232
am: 727b9767b2

Change-Id: If3d895fd197a65b95356d2114a5e866d28f369e4