Merge "servicemanager started property" am: f4dee55a am: 8be057ee am:...

Merge "servicemanager started property" am: f4dee55a am: 8be057ee am: 17cae643 am: 2a3768e2 am: 75e652e7

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>