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

Bug: 79597307
Change-Id: I55e2713512e56b2f860f499ed279b8c153068c99