Merge "Add api_surface prop to api surface contributing droidstubs" into main