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

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



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