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

Bug: 79597307
Change-Id: I06dd797b2badfbd1d0b8773b109e6535f540a1d8