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

Bug: 79597307
Change-Id: I0763a5fe1d46af18665c25833363b6496785e04a