Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: I34b47d573786dd651a7302833f2a49984c053daa