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

Bug: 79597307
Change-Id: Ia83a4eccaa93eb712806fb9c201569be7b920968