[automerger skipped] Merge "add setMetered in SubscriptionManager" am: 899c96df90 am: c71a887b35
am: 43cb017b99  -s ours

Change-Id: Ic598eabd5dd23edccfc87e53c0e0356fac8cbd34