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

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

Change-Id: Ib0fdd5786a2e28d42252555063c5f4db432820be