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

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



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