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

Bug: 79597307
Change-Id: Iabbb17a0dc382744c29898525d404e06322b5d71