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

Bug: 79597307
Change-Id: I67d99e171885199c264c3139e9b976ec5efe085d