[automerger skipped] Merge "Make setMetered and setOpportunistic public." am:...
[automerger skipped] Merge "Make setMetered and setOpportunistic public." am: 609ed338 am: dfbb2567
am: 6eb5fa92 -s ours
am skip reason: change_id Id6f074b15a1c03d00ede2665d44595fa7be965e4 with SHA1 7e22ba61 is in history
Change-Id: I63206b178303e8f166807df762e3c1cca7d13e8f