This is not a merge commit due to
6954130f
(Revert "Upgrade bazelbuild-rules_python to 0.28.0"). This change
is prepared with the following:

- Merge upstream/0.25.0 into
  3e21f23d
  (Merge remote-tracking branch 'aosp/upstream-main' into main am:
  b14b3520 am: e398bc2b am: a1ccc8dd am: f26ff44a),
  creating a commit X
- Create a change on aosp/main so that the filesystem is left
  at the same state as X
  (git reset aosp/main; git commit -a)
- Update METADATA manually.

Bug: 276493276
Change-Id: I455d91c932a77d86d651e51f2220023a606d9033