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

Bug: 79597307
Change-Id: Ia37e2fcc53281243acf2cfde5f583c4164e38379