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

Bug: 79597307
Change-Id: I163164f84620e7e7069e22e91a93191ba2880901