Merge "service: remove re-implemented functions" am: e933aef07e am: 358fce2524 am: 5a72b891c9 am: c5ea6a7d52 am: 4b2a551160

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1874168

Change-Id: I180d585fe322ed287f1be988706a9fa32cbfa93e