Merge "Add test for increment operation count on non-default network" am: 5d41248947 am: f77979a320

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If52e015750ffe1efc4b584b6ef47db240cd8d187