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

Bug: 79597307
Change-Id: Ia684aedfa59c7716ac04c71b4e2cbc0456a7789d