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

Bug: 79597307
Change-Id: I486a0b018d2368afc08a9d56259a2bcfe119afa7