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

Bug: 79597307
Change-Id: I427c6b9e147970d583666cd11e0ff5a24acfc667