[automerger skipped] Merge "Make setMetered and setOpportunistic public." am:...
[automerger skipped] Merge "Make setMetered and setOpportunistic public." am: 1f2e8825 am: efdd19e2
am: 3d57bd7f -s ours
am skip reason: change_id I20552cdec15d7a52160866e82db6edb86f325eac with SHA1 350ef449 is in history
Change-Id: Iae7697494a08e5a95222d387260d2be3c23d3e3a