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

Bug: 79597307
Change-Id: Icdda8a0c892974d93e9a9f15c01e91dc77b724cb