Merge "ServiceManager: doc comment" am: 882bac800d am: 2582d481d3

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

Change-Id: Ifac6cba7e958b959289e19fc332af72d3bfbac3a