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

Bug: 79597307
Change-Id: I1789be24cb1a8be0bbc0862dff91a92c9492c68b