Merge "servicemanager started property" am: f4dee55aa1 am: 8be057ee2e am: 17cae643b1 am: 2a3768e219 am: 75e652e70e

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

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