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

Bug: 79597307
Change-Id: I46bd24d95b3ac15d9e7004b0e87699077f437d9d