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

Bug: 79597307
Change-Id: Id8402ebd823bc3761c63d5958929dbe0ab08b72a