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