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

Bug: 79597307
Change-Id: Ic831b4bf1b8638ef58f44b3fb91d957b89f5c816