Merge changes I5ecf8231,I96a15f5f into main

* changes:
  aosp/android-mainline: update series
  aosp/android-mainline: update series (rebase onto v6.7-rc8-161-g0d3ac66ed81cb)
tree: 294e7e4b1051fc7ef30f11eaf6e971289f45eba1
  1. android-mainline/
  2. scripts/
  3. OWNERS