Merge changes from topics "remove_api_files", "remove_naming_convention" into main

* changes:
  Add api_surface prop to non-updatable droidstubs
  Replace api_files prop to api_contributions
  Remove non-updatable contribution from android_test_stubs_current_contributions