Merge "Test added for AServiceManager_addServiceWithFlags" am: 9a983f2f5e am: 9c095bb987

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

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