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

Bug: 79597307
Change-Id: Id10a33e9a3c75bb9fdf1659c06606d78a18926e6