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

Bug: 79597307
Change-Id: I2e0b222c86e277d6501476bcb4279f4b6b4101b3