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

Bug: 79597307
Change-Id: Iee2ea1d7af50d6ad4c1a642aa8bdb9a8f12d1897