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

Bug: 79597307
Change-Id: I92458f6e195b0aa26c288db9521752e7b6f9b2d5