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

Bug: 79597307
Change-Id: Iac94c8837c868b97e174ff22b5dd0789be926d4f