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

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

Change-Id: I7025ec64f5c9ddb747d9b872304c083a83c6118c