Merge "add setMetered in SubscriptionManager"
am: 899c96df90

Change-Id: I1ab7ac82e395850e37d6a3b76f77a677bde63617