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

Bug: 79597307
Change-Id: Ib4f239109617f8b75766642162aaa7f73d3a205c