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

Bug: 79597307
Change-Id: I2e354b90cd0c0c0ee197e8982f7b3aaed8f64de8