Merge "servicemanager: -= clients log spam" am: 896febc0 am: 9384d621 am:...

Merge "servicemanager: -= clients log spam" am: 896febc0 am: 9384d621 am: f6a2db44 am: 2fe9d01c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2471754



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