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

Bug: 79597307
Change-Id: Iae68de8c1c405e40ecdf8307f7ff86aca27a233e