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

Bug: 79597307
Change-Id: Ic609f3acabdb91d8a1b17e239b175e6c0c6dd779