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

Bug: 79597307
Change-Id: I99565dab3a3def02b2ad26034287963fc878e66e