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

Bug: 79597307
Change-Id: Ia01f9825071243450a084514ba5741fee0cfef0b