Merge "Make setMetered and setOpportunistic public." am: 609ed3380f
am: dfbb25679f

Change-Id: I25c0c4f0a5d1677934b64fc377c2289476abcd01