Merge "[java] Restore ServiceManager#getService() to return IBinder" into main am: cb086de687 am: f069c2c692

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

Change-Id: Id5892e59a79e95ac5919449012fa05bd799efbaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>