Merge "Update tests for PANS network usage metrics" am: e6b895b488 am: df390e2e8b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic312169c70b34bb8a834efae5ebb6b1a6cbb0296
tree: 22f6db409cb0d398dae0e24a7394a1455d9cbf32
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS