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

Bug: 79597307
Change-Id: I5d4108b7a2ead0061dd7ed2314dcf2a2d3d2d6b8