Merge "Add other tracker info in the bg restriction metrics" into tm-dev am:...

Merge "Add other tracker info in the bg restriction metrics" into tm-dev am: 839f3298 am: 51aaecb9

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



Change-Id: I70da94092c73c97ee04426a6ba3f4602e2dcc949
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>