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

Bug: 79597307
Change-Id: I60215ce4299c43ebc72c72b9acbe490ff4f26f9a