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

Bug: 79597307
Change-Id: I3dbae1a7e07d8bf2eff3f50b2c02fe6f747678cb