Merge "servicemanager : Adding clear API to ServiceManager" am: 00a54e41 am:...

Merge "servicemanager : Adding clear API to ServiceManager" am: 00a54e41 am: 77527d1c am: 1c1f4122 am: 6eef6394 am: 296c7366

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



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