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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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