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

Change-Id: I54643465606667343a98bb9871084a2514951a93