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

Bug: 79597307
Change-Id: I048bff1e899eebd9b9d54c53f48ce8296c50666d