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

Bug: 79597307
Change-Id: I55c10d37a1bb29fec0d9047e74c004f5f497b1f0