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

Bug: 79597307
Change-Id: I24d8297e4aa456f6b6785c81e53752d5c7884f22