[automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 5581c36ff3 -s ours

am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 71863e9604 is in history

Change-Id: Ie43cc7dbddd5497dfa069fac5570a7a64eddb2a1
tree: ddd4b923a18cf998f4a4e5f6b673a732556e6d02
  1. core/
  2. services/
  3. tests/