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

Bug: 79597307
Change-Id: Ia98e005208999b395595ef647902768a1199eaa4