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

Bug: 79597307
Change-Id: If9d134235f879c0c5989203205eebe0d7034518a