[automerger skipped] Merge "Added a new capability for temporarily unmetered...

[automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994d am: 09a2ff81 -s ours am: 1a8f7eaf -s ours am: 73bdbd83 -s ours am: 9e6d1b17 -s ours

am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 30be5e5d is in history

Change-Id: Icf9768d391b6c2605c6c2b1c05b7cb53319858d8