Merge "add setMetered in SubscriptionManager"
am: 0dbd3d7232

Change-Id: I3efb722bd7e93af2e2fff5c74bb364710c97460a