[automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 9344d8b677 -s ours am: 46e090d222 -s ours am: 3b2d29fd62 -s ours
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 2bd176d185 is in history
Change-Id: I4d8faea3916fe55ca25d4162893f22d004176116
This commit is contained in: