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

Bug: 79597307
Change-Id: I9bcf29db3ef60716d77139736ec9b3ab13620493