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

Bug: 79597307
Change-Id: I43ba27d6b92b0f071b4c0551b11b883ccfb9334a