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

Bug: 79597307
Change-Id: Id6fa79ad43862c576599c72ee5b995104e68de0d