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

Bug: 79597307
Change-Id: I1a4e30d63017414d2ce2fc6585d338d52ee220bc