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

Bug: 79597307
Change-Id: I131f8959428794ee79a6637f3774f738ebffdc64