Merge "Test added for AServiceManager_addServiceWithFlags" am: 9a983f2f am:...

Merge "Test added for AServiceManager_addServiceWithFlags" am: 9a983f2f am: 9c095bb9 am: 19801444 am: 0f086cd3 am: 4a0332ab

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



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