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

Bug: 79597307
Change-Id: If374ef7bc1c8b862e5be9df7759a447ac8680929