Merge "Do not rely on android_is_in_vendor_process" into main