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