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

Bug: 79597307
Change-Id: I6db3d9db067a59b1fbbd50fd84544646282e3767