Merge "suppress unguarded-availability warning for only AServiceManager_waitForService" into main