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

Bug: 79597307
Change-Id: I25e1d63f3c1f31809b2572eae465a98ca6e27be8