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

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

Change-Id: I2594a70463ab8270bfb873db7e2483d80e0b0c4a