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

Bug: 79597307
Change-Id: I8a08136871b85f39ff95bb81947dd25108274dd3