Merge "Update wifi header summary text to show metered state" into pi-dev
am: 740d37193f

Change-Id: I2fe3ef92aa1def1aab8a28b29a862c7d9a708488