[automerger skipped] Merge "Another way to keep track number of foreground...

[automerger skipped] Merge "Another way to keep track number of foreground services in the device." into tm-qpr-dev am: db77067d am: 0edd7233 -s ours

am skip reason: Merged-In Id4e53ecf8902c8373e79537a2732586c8cb553d5 with SHA-1 b860752a is already in history

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



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