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 am: 6008ed2c am: 547e13f2

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



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