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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53607908e07f8c7c94e1c2ac8632ebb645ea469a