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

Bug: 79597307
Change-Id: I048ff2f62cf3747793f8f666825a6c82cd32a867