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

Bug: 79597307
Change-Id: I4bf828a2cf87e4c4273e724b575fa08b5dab02af