Merge "servicemanager : Adding abort in servicemanager_fuzzer" am: 4ae43230fa am: 34ced5e22a

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

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