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

Bug: 79597307
Change-Id: I63d5ae1b953d740a11179f97f0555e4dbd38d7f9