Merge "Make ag/18284930 work on Wear OS" into main