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

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

Change-Id: I46d385261fc11652253eaddb9dd459e4d39d4f6a