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

Bug: 79597307
Change-Id: I1a731b87f546613e8fb8b45d4e8eaf3f0a09510d