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

Bug: 79597307
Change-Id: Idfddd4f7d40ced5ec85a1263b679f282b54b73e0