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

Bug: 79597307
Change-Id: I1654ea88799d1d23f2cd3956563451e3c7ef698c