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

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

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