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

Bug: 79597307
Change-Id: I2bce0d629d5b551a5d562cd7691b54313216f5f9