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

Bug: 79597307
Change-Id: Ia5b25db7b137bc39db8409dac80bb149a3016dc0