Merge "Stop using deprecated function AServiceManager_getService()" into main