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

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

Change-Id: I2a01565f685e0432e0771fcbe10ae3e8eae0d967