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

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

Change-Id: I44f67a3658ab2d0649f509634afae355f5e2c36e