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

Bug: 79597307
Change-Id: I1f20d5ca0e62522ef2dfb42dbcab75d489e0156a