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

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

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