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

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

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