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

Bug: 79597307
Change-Id: I4f2fd427a617a55587585932e35a2878955d87d3