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

Bug: 79597307
Change-Id: I105047465777e8af78a7bffadc8b0532aaa9c983