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

Bug: 79597307
Change-Id: Iaf450edb8262cef5465f06309556ab24a08222b4