Merge "ServiceManager: doc comment" am: 882bac800d am: 2582d481d3 am: db80e61282 am: e43a8dc3ca am: edc3be6ef0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1821336

Change-Id: I162cdd940c63d2dd5ac740d8198c4f07199f9ca3