Merge "Another way to keep track number of foreground services in the device."...

Merge "Another way to keep track number of foreground services in the device." into tm-qpr-dev am: db77067d

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



Change-Id: I1e6af9cb6525217dc5b8b20225de7244526e1775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>