[automerger skipped] Merge "Set number of foreground services in statsd atom...

[automerger skipped] Merge "Set number of foreground services in statsd atom LmkKillOccurred." into tm-qpr-dev am: fb793ddc am: 4a9a0c3c -s ours

am skip reason: Merged-In Ie98f72c61e05bd9a0322390faecc2ee3abdcc5ee with SHA-1 a5c3630c is already in history

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



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