Merge "Fix a typo in service class" am: 7b38b459f3

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

Change-Id: I72ee0311a6a0f63d6b7a7d3375ac03254302fb62