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

Bug: 79597307
Change-Id: If1240d409fc23b86ad7c9a4ba69a774e031ab087