Merge changes Idbcd6d4f,Ie2d9f8d3 into main

* changes:
  aosp/android-mainline: update series (rebase onto v6.12-9306-g70dbb12e95ec)
  aosp/android-mainline: update series (rebase onto v6.12-9293-g5d38cb9bee73)
tree: 98fafe22fd65de47df848fde95731697e55fc910
  1. android-mainline/
  2. scripts/
  3. OWNERS