Merge changes I5809456a,I87719e22 into main

* changes:
  Run pyformat on bump.py/finalize.py
  bump.py: Bump Cuttlefish's target level and API level