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

Bug: 79597307
Change-Id: I54d3ce36c7f04cf56852fbd267896d728191e6c2