Merge changes Ieacdcbc3,I875001d0,I5a9c9578

* changes:
  Update OWNERS file
  Update generated files for Android
  Merge upstream tag 'v1.46.6' into aosp/master