Merge "KeyMint: coalesce device ID failure code" into main