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

Bug: 79597307
Change-Id: Ia286ebc08219b34e71b1d4a8987f7a59b99494b0