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

Bug: 79597307
Change-Id: Ibbeda526f48865589ac28ed67ce7f5b78cf0d16d