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

Bug: 79597307
Change-Id: Ibb6c6e3f775ee19127711fcc10b2e00a2289a026