Merge "add setMetered in SubscriptionManager" am: 899c96df90
am: c71a887b35

Change-Id: I28cdc1e9e423a3754e09cfedf8dfb81c1801df8f