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

Bug: 79597307
Change-Id: I56180e0541e15516ddb3cbb794f2693cd15ff220