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

Bug: 79597307
Change-Id: I74e331b06834a68bfcf174e782a77fa1c44c93b7