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

Bug: 79597307
Change-Id: I4a76da0091e9b63c1e8378eda89b532c4118bee4