Merge "Add test for increment operation count on non-default network" am: 20f05ed023 am: 7933522fbf am: 730e15b8d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53607908e07f8c7c94e1c2ac8632ebb645ea469a
tree: aae173cca9f50b7f74ec6a0ef447212090fb5066
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS