Merge changes from topic "am-9997b803e8644e99a7015357856dcda0"
* changes:
[automerger skipped] Merge changes from topics "128455935", "123661746" am: dc4cb81c83 am: 1c906d426d am: 2e0ea1ab5e -s ours am skip reason: change_id I41ae6752756d998739fd7635bcc7765f255806d7 with SHA1 7a7e06d968 is in history
[automerger skipped] Remove SubscriptionManager#setMetered API. am: 9b932fa1a4 am: 8231d3b231 am: 37c9ced0e6 -s ours am skip reason: change_id Ia6772dee1bd566e0be6b06455d92c923d2c01b12 with SHA1 fd838e9585 is in history