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

Bug: 79597307
Change-Id: I7b3dbf363db7ab5e975af112c793845171257b3c