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

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

Change-Id: I05f5377aec75599031896b26afeb38c39ee2e188