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

Bug: 79597307
Change-Id: I949821fc7c3884feaec2565415b2db0378ed8b20