[automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 5581c36ff3 -s ours am: 2fcd85f62d -s ours
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 71863e9604 is in history
Change-Id: I56c31471f54180a6e49cf1a72a1793618c5bec1c
This commit is contained in: