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

Bug: 79597307
Change-Id: I76aba51f6b8badf493af7f7c5311cc4d64ae92da