Merge "servicemanager : Adding clear API to ServiceManager" am: 00a54e416a am: 77527d1c6b

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

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