Merge "servicemanager: -= clients log spam" am: 896febc017 am: 9384d621e9 am: f6a2db4484

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

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