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

Bug: 79597307
Change-Id: I52d315b99d316f7265cc782a1dffd9c4c429c0ca