Merge "Fixes crash on launch of AOSP+Soong builds" into main