Merge changes from topic "am-214c591285f74e579baad9171ec87ef7"

* changes:
  Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev am: 096a880fc7 -s ours
  Merge "Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours" into android12-tests-dev am: 4ffcef6ce7 -s ours am: 8b69af92f9 -s ours