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

Bug: 79597307
Change-Id: Ia835254fd3ade501a9925ebf4a75c2175ccc5e66