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

Bug: 79597307
Change-Id: I7015e00f081032e550d1266dcd262d68fc23a418